Another fix for registration issues

Addresses #330