Fixed duplicationbug