Some quality fix