improves support of shindig 2.5 after the code merge