Half fix (26/32)

Half fix