fixes pt. 2