[Closed #395]