update with bug fixed