Fixes the issue #5