fixes #2266