bug & crash fixed.