Fixed: iOS5 compatibility issues