Added char & fix for android