fix for registration - Issue #15