fix for the first part of bug #458099