fixed bug ===