Again, this time w/o clobbering the /register handler