unify handling of q=0.0