Fixed Major bug