Issue #2362635 by nadavoid: Fixed "Missing bundle" errors.