Fix ACT-1082