fixed in fbbf2df and 65ff71a