Quick fix for issue #80