Fixed and moved to char-tab.