this fixes #1130