Don't remove handler from map