Should this be a %q instead?