fixes from Vladimir Dronnikov <dronnikov@gmail.ru>