Fix bug #955 thank bigsfr