Issue 124 and 123. Only did the 2 seconds wait as 123 should fix the other issue