Fix bug for 1.9.3