Magic added
fixed the symbol constants during merge