fix unsets and link new handler