Bug fixing [Fixes #83982626]