query 8 fixed