another fix related to issue #82