fixed to work with the new REScala structure