Fixes #4914