Fixed 1.0 miss-merges