Fix code abit