fix timing mechanism