Diagnostics Code Fix