make this compatible with bundle