Fix bugs from the live test [ wrong registration time ]