andrey fixes
#5 imp