Merge fix 2