better workaround for Scala-2.11.0-M6