fixes #1138
fixes #1134