Possible fix for issue #13