Bad bug fixed