Fixed registering issues regarding rank