Fixed for real data (and 'fancy' @ sign escaping)