bug FIXed