fixing problems with shindig 2.5.0