Updated eca-shared to catch NaN issues