bugfix for version <5