Mostly fixes offset creep when using the toggle button. #187