Fixed #367