Tryed to fix timing issue