Bug fix (bouncing handles)