cheetah encoding added to fix bug!