Issue #920 Todo removed