second try on issue #1375