Commit #9.  See issue #4