fix handle positions