Rewrite symbol handling to use the normal symbol