Fix bug reported by Thibault