Added another query fix