Change fixing for 1st bug - checking for main thread;