I will add a todo. Dont want to change behavior with this change.