quick-fix related PR #2091