Quick fix for registration