Quick fix for issue #1