fixes #2313