Fix 539