fixed a critical bug for 5.9.0