A fix for that registration fix