Possible fix for Bug #12538