Potential fix for issue #31