Fixes #398. Fixes #386.