Fixed others (32/33)

Fixed others