Fix 3.0.68 merge

Signed-off-by: kecinzer <kecinzer@gmail.com>