Fixed animations due to iOS8