Fix for registration