Fixes #3819