better Bugfix