fixes #2679