Avoid double timeout on before/after
Merge pull request #286 from Marsup/duplicate-timeouts

Avoid double timeout on before/after