FIXED merge-bugs