Fixes #4195