fixes #2117