closing features #5066 and #5266
Fixing bug relative to Yohann's feedback...