Timing zero fix

Closes #15