Closed #36.