added a fix for qua non.