Fix bug: change name to q