modified qno bug final