Fixed #338