fixes #2034