#13

and report fix