Another ESSL3 fix