fix singularization