Fix Q002 combinations