Fix for multiple registrations when using autoall

This fixes an issue @gidden ran into and @ronaldnie first noticed :)  @gidden this is yours to review and merge now that you are a developer :)