Add @ to reserved chars, per spec