A Better fix for #3912

A Better fix for #3912