Fix for ACT-2056