Possible fix for bug #11595