Aw/issue1335 (#1337)