Fixed JC-1486:
-fixed 2nd scenario