quick fix for CAT-209