Half fix (17/32)

Half fix