fixed for iPhone after merge