Bugfix (pt. 2)