Done. See #621