fixes bug 928051 wip