Fix Waiting For Device Using Universal Zip