Fix code bug again..