fixes #1450
fixes #1433