bugfix 6.10