fixed q no u handling