Deal with @s in calendar names, fixes #1?