Fix the rest of the f*cking bug
Merge pull request #57 from rbanffy/master

Fix the rest of the f*cking paddle bug