Fixed problem with q