Upgraded to the current version of unicorn 2.2.0