fixes #1877
fixes #1878