[Fixes #50143677] Added bug fix