Report Replacement bugfix