Part 2 of 2 fixing NodeBB/NodeBB#2440