fixes #2324