Quick fix for issue #6