Fixes #4178