fix #828