Further fixes for issue 2160
Merge pull request #402 from timrae/fix-broken-reviewer

Further fixes for issue 2160