Problem described in TODO fixed.