fix edge case and wire validation to bootstrap