Quick fix for issue #2