Fix issue 2906