Solved a problem merging with master.