Quick fix for issue #41