Part 1 of 2 fixing NodeBB/NodeBB#2440