change null to bundle