Fixed to work with Scala 2.11