[Olena-patches] milena r1665: Fix my previous patch