Fix some overdoing in fix for issue #1