Fixes handling of symbols