Fix Issue With some Frawrds not being monitored correctly