Fixing #218