Singularity-1653

Singularity-1653