Fixed com bug 2!