fixed timer
merged