Fixed problem in symbols too!
Merging changes