New fix for ACT-2107