another fix for issue #118