Fix #389.
Fix #390.