added iOS5 handling (no crash, but UDID not preserved either)