Skip Q unless there's a U

Here's my suggestion for issue #2.