#87: re-register correctly after working