Update fix for: GF-45640