[Closed #418]