Fixed issues with giant paddle

Might have raised a new bug by removing the +8 thing?
Merge remote-tracking branch 'origin/master' into bugfix