fixes #2381