temporary fix for CQ