Fix for num_q limit