fixes #2312