Fixes #4058