Fix failing specs on master #158