Soon done, handler bug remains