This is the 3 line fix for 1091530,