Done, see #338