fixed #290; reworked timing
Merge pull request #322 from OpenROV/bug/290

fixed #290; reworked timing