#FL-1447 should be fixed