Fix for ACT-1826