Sarina/fix quality