Improvement of the Bugfix