aligned for usage with Play-2.1.0