Fixed qvality driver code
Merge problem