Secret fix part 2