Bugfixing Pt. 1