fixes #2243