ENH: move fix from main tree
2 files changed