add fix from ticket #2290