Fix for recent changes