[#858] Fixed

@rumca Can you check please?