Fix issue 2235