better bugfix for previous commit