feats[8] fix