Merge fix (2)