This isn't needed for my case either, but I added it latter to try to mimic better the previous behavior, because it might trigger the same problem on other cases. Anyway, I'm trying to find the real cause.