Fix 1, 3 in #597

#597