fixes #2684