fixed timing (sort of)

Change-Id: I2aea56a89b90d9f91dd8b8e0f020d2640401d7db