Fix for current takeout data