Potential fix for issue #17