Fixes #4534