Yay... first bugfix