adapt to latest firm version