backporting to 1.6 because zvzoivlkemfkzoie2)($($!&&&
prepare 1.0.3