More work on char 2 case