Escaped *'s and added missing _