Fixing #692598