Added one more workaround for delegate rampage