added escaping for prefix