Hotfix/cheetah 2