Fix 3-505