Merge fix #2