small fix on handlers