Fix HAL-219 & HAL-220