Fix/better handle same reports