Update to fix issue #37 on latest ver in master.