Registration fix