temp patch for #1652

I will dig deeper to find the root cause but here is a temporary patch fix.