Fix report return bug
clean up