Potential fix of the -q bug