Chapter 6 fix for Play 2.1-RC1