Quick fix for issue #3