TASK Fix 7.0 compatibility issue