Fixes #4305568537754