Fix Issue With some Forwards not being monitored correctly