fixed Bug