bugfix:
make it combatibel to 2.50