Fixed #329