Fixes #4993

Fixes #4993