Make room for Scala version