Fixed bug: registration