Possible fix for Bug #12265