Fixing namespace for q