Fixes #0014897