- Potential fix for issue #74