Possible fix for issue #19