Fix 5.3 compatability issue