Fix for ACT-1854