singularity bug fixed