fix #832 again