fix issue #69 begun of issue #70