Fix for ACT-1888