Fixes the issue #41