Merge fix 1.2