Fixes #3211