Scala performance fix
Scala performance fix