CRA-662 Fixed int-double conversion issue