Minor registration logic fix