[Closed #317]