Rollback to original code

There was change in multiple character with some type error.