Add option to do nothing about phi1 singularity