Handling singularities