Change the fabric regex as well to include "@".

Really, it's actually *everything* except colon.