Bug Fix - register