Fix replacement
Centralize timer handling, fixes #6