Make it work with the BS3.1 branch