Possible fix for issue #277