andrew/24pullrequests — pull request #334 by despo (2013-11-30 16:37:42+00:00)
Title: wrong fix was applied to #331, variable was overwritten

this is the actual fix