Fixes #4388