fix #2159 Long standing backlog issue that was split from an upgrade of prettier as it created too much diff. Finally doing it