Final version of this issue, still not fixed.