fixes #850
fixes #851