fixes #1155
fixes #1120