Faris/Akash = #1575 - fixing report schedule