Fixing shippable at last