Fix for Scala 2.10