fixes #2124