Fixes to close issue #164.