Fixed interface a little bit.