Possible fix for issue #155