Committed correct version

*facepalm*
The tested and corrected version. I should never commit things late at night! And maybe set up git properly...