bug fix for issue #54