Work around Scala 2.11.4 compiler issue