Made report far more robust.