bugfix 4.0