correct typing and fix a bug

Merge request reports