Merge "Fix SQL"