fixes #2254