fix bug 12.7