This fixes #4898