assigned here bug fix