Fixes the issue #10