fixes #2036