Fix 500
Finish register