bugfix for the bugfix