WIP EQC fixing for PR