Fix for ACT-1054