Fixed Merge-Bug