Finally fixed bad merging