Bug fix for "SELECT *"