Fix for 5th query stage 7a.