Ensure passing 'self' to onValueChanged (upstream change)