bugfix for bugfix bugfix bugfix?