potential fix for issue #79