final bugfix for this version