fix on patch according to the change from G5b26