Just thought I’d say, I apologise if I’ve called undue fuss here 
assuming Epic’s fix below is for the above bug, I’d also recommend taking it, not my code, as they almost certainly know what they’re doing a whole lot more than me! Just glad we have a fix.
fyi, If anybody has had a chance to test their fix in 4.18 (is it compatible?) I’d love to know.