Is the plan to fix this here or in a future pull?