Bug fix in implementing issue #62