fix 6.10.12, close #574 and #577