Fixed #358