add compatibility with Scala 2.11