Do not return `q` if it is empty