From tests, this now works