cherry picking correctly