Fix for ACT-1702
Fix for ACT-1703