ACT-2027 fix