tentative fix of timing