Fixes #4963