Fixed others (1/33)

Fixed others