FINALY FIXED ISSUE #7!!!