fix handle order