BUG: 7885 Second try