Fix for new API style.