Fix issue 2861