fix #743
fix #744