Trying another solution for AMEC-1675