Fixes #4145