closed #535