closed #832 #757