recent pull requests merge fix