Fixes #1313 - identifiers lost when starting with WITH