Merge fix of #4