- Fixed for new interface.