Fix dwf's interface change