[#ENGINE-16: Fixing bug]