add issue 1934 fix to version 2.5