Fix bug by redelegating on option change