fixes #1079
fixes #1077
fixes #1075