Fixed timing issues while exchanging messages