Fix for AMEC-2374