potential fix for security issue #173