fixed '@' crashes