Fix for (ITS#6872)