Fixes #4600