Fixing #367