Fix for ACT-1965