updated for changes api changes in scala-util