Pong fix

Quick hack to avoid hitting the bug in issue #93