potential fix for issue #1041