Fixes #U4-2458