ACT-1271 fix