Horia's 16B patch