Possible fix, pt. 2