Align with Alpha13
Found the missing noise from ",q"

Suppressed @JohnOH introduced a bug, but not sure about the correct
value to return.