Amended in #20