Use correct bundle wrapper