Fixed bug with failed query line 15