Fixing after the merge