fix handle call