fixes #2657