Fix validates
Merge fix validates on report