Merge fix 3