Fixed shield bug and changed bundleID