More bugfix for giant paddle
Merge remote-tracking branch 'origin/master' into bugfix