second bugfix (and last, for now)