Fix 620

Done on top of #399