Switched the query to fix #136.