Mob 1852

@nandy-andy @RafLeszczynski @aquilax @rogatty 
I thought of that, but i think i forgot it afterwards. Great that you spotted that, will do the refactor.