Fix quality bug try 2