Added prefix removal of '@'