The validation issue and the ordering bug are fixed