Bugfixes:
    - timing *actually* fixed

