Fixed to shindig for 2.1 release