Unrelated fix but looks good.