closed #253, closed #252