2nd attempt to fix issue #2 by untainting some arguments (thanks to
Michael Meskes)