Tracking the fix here for #1077
Tracking the fix here for #1077