Fix/master/issue 3494