Fix for ACT-1642