Quick fix for issue #69