Fixes pt. 4