Half fix (16/32)

Half fix