Start to fix bug #3921