[Closed #405]