Fix issue on message refreshing