bugfix for failing tests