Potential fix for issue #30