fixes #2348