Fixed bugs to execute