Late fix for new interface.