FIX: fix for Oksana