bug fix related to issue #1