[JDP-1] Fix narrowing issue