Untested fix to handle ASK and DESCRIBE queries