improve bundle friendliness