Local change to fix iOS8 issue