Fixed #375