oops: really commit TD's fix