Fix/master/issue 3415

Fixes #3415