[IN-61] Fixed