fix for 1049589 and 1049591