Registration fix for OLD #2