bug fixed!!!