Fixes handle position