[Closed #425]