ACT-1977 fix