fixes #2224