Merge pull request #2091 from akruphi/fix_2053_last_symbol