Fixed up Scala too