Fix issue #161

EOM.