Solve updating issue a little bit more elagantly.