1. Fix this first.
  2. Then fix this.