Make compatible with Scala 2.11