Previous commit did not compile on older compilers