if you see issue here, i am ok to reject this PR at all. its minimal achievement does not worth risk to broke something at this level. you know code better than me.