this is to fix bug 6105