Make it working with scala 2.10.2