Fix potential de-sync issue and remove useless delay