Fixed #353