Merging a fix