fix bugs for baby