Fixed single Q bug