Revert change, other workaround found
Merge pull request #8 from dieterdemeyer/master

 	Revert change, other workaround found