Fix https://issues.jboss.org/browse/HAL-328