possible fix for issue #1333