Reinstated ECOMAPS-41 fix