fix cpu issues in correct branch