Attempts to fix issue #230 reported by @foutrelis