fixes #2273