Fixing the wheel problem