bugfix for previous bugfix