updated, see #50