A small fix on top of Jean-Frederic's df8af31db7