testing 2.13, with fixes