Possible fix for issue #240