Fixed bad merging of MODE-1740