bugfix 7/9