Big wobble bug fix