Fix for ACT-1934