BUGFIX: guess I should test again before commiting :)