temporary patch for #3123
Merge remote-tracking branch 'jpab/issue-3123-tempfix'