Fix: Moved check for bundle name to default case