Half fix (24/32)

Half fix