[WIP] Fixes #4943