Fixed overwritten code