Upgrade to Play 2.1