Improve handling of dynamic singularities