Update Handler fixed