Make sure only called in 3.x container