Apply staple-patch; fix