FIX #6 - upgrade to play 2.1