adapt to changes in Scala 2.11