Revert to d16aeb0
char bug fix
merge