Potential fix for issue #291