issue #1071 + test