wrong fix was applied to #331, variable was overwritten
this is the actual fix
Merge pull request #334 from despo/correct-fix-for-331

wrong fix was applied to #331, variable was overwritten
Merge branch 'master' of https://github.com/andrew/24pullrequests