fix for #2687
fixed merge conflict