Fix for ACT-1929