fixes #2241