fixing bugs related to last update