Unit and partial fix for NH2504