Apply workaround for registration bug