Fixed on-update issue