Todo report fixed