fixes #1815
fixes #1812
fixes #1811