Fixes pt. 3