another fix for issue #99