Add Iat complete fallback

Fix item tracking