Fix and Improve Singularize :)