fix for bug #11897