Copy in issue fix from open source