Fix for ACT-1888
Quick fix