Hopefully prevented startup loop. Please test.