new fix for CQ5