Update Issue 278

Backport to master : Fixed #comment Fix + non regression test
(cherry picked from commit 1f00ab4885dec571d06f23d1535e3ab3648448b6)