Bugfix
More duplicate Code removed