Fixed Register, Fixes issue #1