Temporary fix to avoid ACI penalties

By