Proper fix for 3598894 and 3556410