Hack for fixing qa names