Fix wrong timer behaviour