Doubled messages problem fix

30 seconds gap