(x) Fixed small issue with singleton registrations in ServiceLocator (occurred only in combination with Remove)