fix for new interface