Half fix (25/32)

Half fix