actually properly fixed the cyclic dependency current mode thing that was causing #26 (see also #25)