Fixed #373