fix for null in extra