I'm fixed few bugs...