fix #535