Fixes pt. 2