Fix changed interface