Try to fix Berkshelf again