Support Fuji changes.