Fixed error reported by Jean-Marc