Final battle fix