Finaly Bug Fixed