Fixing up the q