[FIX] No longer need to have the escaping hack