Adapt to play 2.2.2