Fixed #324