(#1605) - Remove race caused by latest