Fixed bug for 1.9