BUG FIX: Query Corrected