Fixed interface rewriting
Fixed interface rewriting