Fix #10 with Don's proposed change.