Fix bug for 1.6.0.1