fixes #2342