Fixed to work with Scala 2.10.4