Remove Q q mapping because it causes problems