Fixes the issue #218