More bugfix. Yay