added checks for buggy QSA