fix handler bug, not in dist version..