Fixed always having to register