Scala fix after CR