Fix for #411: iHate fails with singletons.