Fix initializer for HH7/AF7