Update Handler Bugfix some Implementations