Fix for ACT-1680