Fix for #6

Proposed changes for issue #6 problems caused by registration bots.