ugly bugfix 4.0