Fixed reporters loss
Merge branch 'issues/5@master'