fixe minor error in merge from vanicat