Changed to be ZF friendly (I think)