Fixing regression introduced by yesterday change
Merge pull request #698 from wmathurin/unstable

Fixing regression introduced by yesterday change