Merge fix2